Trying something different with class names.  Still doesn't fix the split-on-edit issue.