#522,#478: Shifting docs around