De-inline a few functions which are large