Piers' new version (but I unfolded a few doc strings).
1 file changed