Next batch of changes for Mary's fixes.

This is hard!