Avoid namespace pollution and allow the compiler to optimize better.
Signed-off-by: NRoland Dreier <rolandd@cisco.com>