Refactoring code: Get rid of workaround overwriting constants just for compatibility reasons.