More use of after macro
Minor tidy-ups