[Squash->2] Dropped anchors where possible
[Squash->2] review fixes