Some minor cleaning up [ci skip].
Fixed the issue with the wrong message being displayed after adding a term directly and removing it straightaway (closes #310).