Noah Wolfe authored Aug 11, 2016 and Nikhil committed Aug 22, 2016

- Moved switch reverse event handlers into separate functions located
before their forward counterparts.