super-mario-world: merged in wording changes from wub