refactor: Combine map-merges where appropriate

Closes #13