Big crazy merge of prod and verbose option

(We're not actually taking any substantial changes from prod; it's an --ours merge.)