Break bootstrap into two phases. Clean up some copy-paste nonsense.