Variables discarded, included can be defined closer to their usage.
Co-authored-by: Martin Holst Swende <martin@swende.se>