un-inline some gratuitously inlined functions