Cleanup of syntax properties and other code.