Tweak some inline policies. Not totally crazy yet, and in fact we now have one less ifdef statement now.