Refactored more system-properties into real configuration entries.