Replace anchors with explicit types.
Improve readability, use the local convention