Fixes and cleanup in Drude thermostat.

Change-Id: If8fe93995373862fcbcd0723c55fd30d011502c6