Avoid unexpected ordering of suggestions. Closes #663.