Improve build order
Fix a typo in chooseBodyClass()