I think this at least partially addresses #801.