Added actually compliant macro expansion.