Adjusting types, inlining

Inlining fewer long methods.