More const forcing and simplifications.