No need to change: after reading the later code, this seems clean.