Brought back portions of the old sorting method to deal with these cases.
(This update probably needs more testing and review than I've given it.)