Added wait conditions that just fell out in master branch. There doesn't seem to be any commit removing them, they are just gone
Allow quoting of parameters with backticks
Use optionals where it's more obvious