Infiltration refactor

Refactors stuff to make new spy abilities a bit easier to implement.