Sounds good, rebased patch is coming up.

Unfortunately I couldn't move the `let stack = ..` out of the match due to dynamic borrow checker errors. :rage: