API: Followup on r43014: clean up some more