Incorporate and polish Thomas's changes.

Not sure if I like putting the Store into the argument of the commands -- makes everything harder to read, and it never changes...