I think Brett Meyer is right about this one though - I think this needs to wait for the SQM work; the current parser just makes this too difficult to fix.