Small cleanup for ECL compilation