Changes to work with actor-related things
Now works properly with infixes.