Syntax corrections.
Even better error reporting.
Support splay on waits.