internal/charmstore: minor changes for review