Updates encouraged by @pmjones at #cfn13