Comment clean-up
Have leading tie-breaker elide shim