Simplify even further.
Fix some more inconsistencies.