Simplify logic in resolve_path

Signed-off-by: Raul Gutierrez S <rgs@itevenworks.net>
Rename AugumentedClient to XClient

Signed-off-by: Raul Gutierrez S <rgs@itevenworks.net>
Rename AugumentedCmd to XCmd

Signed-off-by: Raul Gutierrez S <rgs@itevenworks.net>