Syntax cleanups on experimental vesion. More cleanups, documentation, and tests are needed.