Switch to yaml for BV params.
Minor cleanup.