queso/v0.47.1] make distcheck passes. Ready to merge.