Switch to not use maps internally.