Tracking Actions refactoring to accomodate Custom Events #472
Minor refs #472