device.h: code cleanup and improvements.