CLI

- The ::insert method is not needed, and is removed.
CLI

- Added explanatory comment for commented out code. Not sure what to do about
  it yet.
CLI

- More strict definition of what is a tag.