Single quotes on non-interpolating strings
Minor comment, error message, and inner block argument name refactoring
Minor spacing and inner block argument name refactoring