Bunch of nice looking cleanup stuff going on here... Want to evaluate them for pulling them upstream...