Add --always flag in the event that someone removes all of the tags or something weird, and to set a good example for others to follow.
Refactoring of variable names towards issue #422, zero binary change with this commit.