Pedantry patch from RDB: sanitise header use, correct one comment