Just a committing recent changes while attempting to clean up the process of passing attributes for semantic actions.