Update copyright date in headers
Make aliases work

Also, fix combining remaining tokens into a single final argument.
Fix tag-conf settings (collapse)