Also since the API changes creeped into so much code,
decided to just go ahead and change the remaining code. #624