Addressed these comments in c6ff517. I'm not including `.use_priority`, since it should not be relevant any more.