Merge "Double quote some statements for zsh compatibility"