Promoting recursive calls to internal calls, fixing PSR2 problems