Type refactor complete--builds again!