[ET Trac] #582: Semi-automatically split McLachlan's calculations