Minor code style changes
Add support for passing arguments to procedures specified for 'ON'