More work on Clean syntax highlighting