Just to make things consistent (and make it so I can submit more useful changes), here is a patch which replaces the scattered uses of number_of_foo with get_number_of_foo as we had some of each before.