Improved call order checking. -Micah