Require pairing annotation; readability tweaks.