Bunch more migrating-off-prelude fixes