Extended the compiler some more