Switched to Beau's fancier implementation.