Sprinkled around a function to remove unnecessary subexpression wrappers.  This should give an additional performance benefit.

Signed-off-by: Rick Minerich <richard.minerich@gmail.com>