Map popular doesn't populate argument properly

There is a mismatch in the code between Option and Argument, furthermore, in case of argument the populator tries to inject using reflection.