Improve overall consistency, allow some factorization.