Slight cleanup and compiler concessions