This is a squashed extract of several commits, minimally edited to ensure it compiles. Related to #197. Related to #715.
