More work done on #61. This should be the last of it, I hope.