Updated files to include `after' macro.