Simplify TODO carry-over.