Reformatting and minor dialyzer fixes.