Minor code style consistency fixes.
Fix a couple of Dialyzer warnings.