Simplifying tests. Adding braces. Folding in SDL event codes into the DOM2SDL lookup table.