Various cleaning up
Opportunistic call inlining.