Use macro from w3. For details see ChangeLog.