The two paths are equivalent except for one argument, which is already
available.  Merge the two codepaths.
Signed-off-by: Avi Kivity <avi@qumranet.com>