Replaced Klassy-DefaultImpl setup with fluent singleton.