Rename `and return` -> `then return`