[squash] Incorporated Atgeirr's valuable remarks.

This commit should be squashed before merging.