Atdtool: make syntax highlighting more robust.
Cleanup: method naming.
Merge branch 'master' into buffers