[follow up to #148] Misc code cleanups