Make public, add diagnostics.