Fix defunct tags

Seems to work, though it's not the most eloquent Ruby code I've written. If anyone wants to hone their refactoring chops, go for it.

Fixes #145