Continue fixing up breakage from draw changes and file separation.