bfile.c/h cleanup.