Moving path dependency back into 'command'