some more readablility tweaks in system/core/Common