For those interested I've extended the patch to support the SQL3 UNDERsyntax...
ftp://ftp.tech.com.au/pub/diff.x