Tightening up BootContext.java some more