Finished first pass of syntax conversions. All current tests pass