Reorder key arguments for consistency