A bit of cleanup in the abstraction code. Port of changes from new_normalization that are standalone.