Address review comments.

Review note: last chance to say anything before I merge this into master! Assuming
no objections, I want to push this into master before integrating the rest of
the exclusives code.

Auditors: benjy