SONARPHP-327 Small refactor.