Further simplify implementation.