Sync with upstream
Drop deprecated tag maps

Closes #18.