More work on Pygment support