Fixed closing quotes and block arg lists

The last commit you did broke [.  So this is not at your head but two commits back.  I hope that is easy for you to merge.

As I mentioned, my code isn't nearly as compact as yours.