Would it maybe make more sense to move the `reomve_superfluous_config_keys` call to `expand`? Changing state in a query method feels a bit weird to me.