Constant expressions refactoring