untabify, re-indent, public-ise splicers, other minor tidy ups