Better handling of system properties.