Fix failing special instance trait events

This is a re-submission of @burnpanck 's PR #77 , fixing a few style issues without needing to push to his fork.
Thank you, @burnpanck!