Minor code improvement
Remove the need in unhygienic quoting
Improved macro implementation