these aren't overly speed critical, best to leave it to the compiler. as
a side-effect this fixes Visual Studio compilation (should have been
INLINE)

Change-Id: Ic81fb5ac76bc19c61efb2f1a965c0f79e9e45ebd