Merge "Address syntax / error case nits"