Will try to do something about this (and below) Demeter violation in a subsequent PR.