Fix various syntax errors.
Fix extraneous indent.
Merged syntax fixes
Merge branch 'mattdeboard-fix-syntax-errors'
Manual PR merge of syntax fixes