Followup r96369: update child classes and a few callers