Only static functions are inlined.  Need to look at always_inline
and understand that better.

Added a couple more LIKELY branch tests.