Merge "Fix a braino in the stack layout."