By TravisCarden: Fixed inconsistent use of late static binding.