Fix APIs for Commands with a single-Element context