Re-enabling some inlining that we had disabled due to correctness
bugs (now fixed).