Fixes to get Macaroni to compile with Macaroni 0.2.2