Monadify rename/RnPat: use do, return and standard monad functions