#30 - improvements to event-finding and argument list building
And some VB tests, to make sure we don't break that integration.