Adjust to new avatar markup following Stash upgrade to 2.12