Fix poorly ordered methods.