Various tweaks in response to the most recent SPARK 2014 wavefront.