This appears to work with mainline now that the new parser has been committed. Does this nead a testcase (and if so where should I put it)? Once that question is resolved I believe we can close this bug.