Eliminated some common subexpression in aero