More improvements to older CFTC parse code.