Changes to support something close to AS 7.2.