Reorder some things in overture, fix implicit args