Improve highlighting of fallbacks etc