Short of adding a post-process method for these type of one-offs, thats the only place we can work around this issue.  We do similar work there with the dummy node to work around a similar issue.