Have cleaned up some patches from @alyssa and me that inches us closer towards initial Bifrost support in master.
