PMO-2763 Allow long and short form (iterations/its); some refactoring to ease future maintenance.