Make accessors in previous commit static for convenience.