Restore support for [cpp] and [javascript] tags