Clean up the highlight plugin

Fixing various issues that were preventing language specifiers from
working.