Decided to embrace Spring and simplified the bootstrap code.