Fixes to new SDL parser. Tests need to be rewritten.