Further simplification/refactor. Project now builds again.