Revisions based on UMA telecon 2014-02-27, the following weekend's spec editing session, and the refactoring of the feature tests.