Minor attribution control clean-ups
Merge pull request #481 from twpayne/attribution-control-clean-ups

Minor attribution control clean-ups