GPII-543: Make followingElement grade added only when needed.