Make a couple of functions inlined, and other small changes. Change-Id: Icd11b20f0fa2ddb14621df401f95cf0ce2f6be28