DO NOT MERGE -- this notest branch is just a way of packaging review comments -- discard when finished.