Accommodate changes to SMART support.