Post-#17 documentation