Restructuring for #665 and #681
Improved calculation speed by a tiny fraction.
Authored by: numere 2022-04-19
Parent: [r1121]
Child: [r1123]