Cleaned up how format dispatch is done.