Still working on #2, but also inadvertently investigating #28 as well. Slow progress.