Some dialyzer cleanups.