Handle the simplest (remap) case early. This makes code
simpler and reduces one level of indent.
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>