This is mostly temporary measures to work around bootstrap circular dependencies until those are fixed.