Cleanups to new-tags. Fixes Issue #27.