Update exported function comments to match method signatures.
Refactor handles declaration.