delroth bh1730: another pass of cleanups for upstreaming

Latest commit 01b404c

Feb 27, 2018