And yet more learning / doc refac.