This is a mostly 'cosmetic' update, in that there were no real features
added or updated. Rather, some code was replaced with functions/traits
from the quirks crate.