More inlining.  Just one this time :-) (#5)