TODO: Probably either want to use Integer everywhere, or explain our rule for choosing where to use which.