More form tidying up:
* All forms where provider has to be current user use simpler encounterProvider tag with suitable comment
* Tidied up TB forms