Updated source to use `after' macro.