Here's a simplified patch (I'm unsure about the right tab convention
to use; I hope I got this right).