Links to AS 2.0 draft... mild refactoring