Cleaned up problem definitions.