Improvements to {{REVISIONUSER}} handling