Get rid of a couple FIXMEs that depended on changes to btcscript, and wrap some long lines