Minor simplifications to COMPILE