Enabled simple ordering of handler types for #1036