Build appears to work again after refactoring