Cleaned up ProblemFactory.