Add another couple of TODOs for lap.