81aa081ab6
trailing context were unnecessary). Remove unnecessary { } around simple actions (just a return statement). Fix some * vs + errors.