Add some inlining by hand