Updated to reflect comments and cross-module discussion from 2013-12-04