Making `highlight` behave more like redcarpet

See issue 2510 for details.