bcbc4761fa
these aren't overly speed critical, best to leave it to the compiler. Change-Id: I231c14abee5b845d7b8e8454832f2feb22c6ce45