Bug 921740 - (follow up) Make attributes and macros lazy too.