Merge pull request #165 from erickt/2018

clean up some post-2018 code, fix clippy suggestions