Properly tracks requirement completion with cross-user pollution

Fixes #397 I think