A fix for trivial policy

- Try and fix the sane origin policy (not sure this is correct still)
- Add more assertion
- Change trivial policy to specify where packets can originate so we
  stop having crazy packets