This commit combines parts of two commits from the mac-rom master branch. The idea is to clean up the history for new forks, boot3 in particular.