This routine was (is) pretty complicated, but given the recent
changes, it seemed like it could be simplified a bit.