More work towards OO tag system.
Merge.