Conver SQL from in-line escaped scalars to block scalars

Block scalars allow you to use newlines, and are far more readable

This commit also catches some extents that were missed previously.