Some cleanup. Mostly rais-ify checkins