Optimisation of THELIA_* constants usage