Fix weird race condition with Return#@markup

... the tests pass for me