This shouldn't have any visible change, but it will make it easier to
review the changes made later when introducing the per-CPU-model
variants.
Signed-off-by: NEduardo Habkost <ehabkost@redhat.com>