- Removed shape rawptr comparison hack (no longer used)