More cleanups to the captool.