Agreed for both methods.  This PR is getting huge though so I'd prefer to do this later.