Resolve ordering issue.
Support nesting of lists for quoted literal.
Use syntax-quote, rather than manual construction.
Formatting.
Use `declare' to resolve circular dependencies. Some cleanup.