Goat tags more things now.
Maybe fix a traceback.