Better ordering of contexts