Fixing highlighting issues with @if