fix a few s/expr/rhs/