I committed all the new code related to the stack changes and bug fixes. I'd be happy to have you audit all that Harald. Please also see if the FixedMapping OR behavior (denoted by comment) is the right thing to do. The test is fairly complicated and I didn't have time to analyze it in depth, but it seemed okay off-hand.
Patrick Earl
