Be more idiomatic with the plan generation.