Trigger code refactored. The II trigger can accept complex transforms which use the index attributes.

Also refactored the filter code a bit to make it simpler.
Code cleanup.