Agreed. Total hack here. I think we have to change the interface a bit to support an `after` callback.