Adjust for Matt's recent changes.