Major bootstrap overhaul/cleanup.