Reorder and rephrase a few steps in the Mario spec