Made it so watchpoints always checks for user addresses now, until I make some broader changes to how policy instrumentation functions are accessed/invoked. Updated the watchpoints mangling to recognise some new patterns.