Fix up some style nits of last uq/master merge