More cleanups for migration

Per https://github.com/bolt/bolt/issues/1496#issuecomment-52386943