Address review comments

The only Dialyzer differences between the base of the branch
and the tip is the line numbers for the complaints that
are present.
Fix a few dialyzer complaints