Improve ideslave highlighting of primitives