Preparation for sqlite config - minor refactor.