This avoids an additional cause of recursion via the semicolon/multiple command, which fixes #933. It also provides error messages on the expanded command. This fixes #598.