More work on command descriptions and context

Change-Id: I3f4731b28f77ea80e2d0c5516af2f36106fcd920