Improve robustness.
Add note about prior art.