Some refactoring of configurations and declaration semantics.