MC: Track section layout order explicitly, and use to simplify.