Hrm, good point.  I'll have to think about that.  In general this PR makes some pretty heuristic decisions.  It's not at all principled.