A few more changes.

This is more of the same.