Make trace output more easily filterable
Suppress personal details

Due to the build process, I have to check this in BEFORE I can even test if it builds...
First regex didn't work - try again