Clean up from merge, and respond to feedback.

This commit should be squashed, but it required reordering and had dozens of conflicts. So I'm letting it stand.

Respond to feedback.