Unrequired header removed.
Much better type resolution using a separate stage.