Reorder productions to fix kwargs issue