Fixes due to ceylon/ceylon-compiler#1360