Take advantage of fixes to cross-crate constant matching