more cleanups, move a check for "roundedness" earlier to reject