Further work on command registry.