Upgrade to Impact++ r5 and remove a bunch of custom code. Yay! More changes to come.