Incorporated review comments. Moved Unset* to be alphabetical order with other internal methods.