Dialyzer fixes, formatting and other minor changes.