A little semantic touch-up