Fix reconstructing variables subshell expressions