More cleanup of bfile stuff.