Misc cleanup to BAMMtools fxns