Refactor for 1.7 build prep