Start reworking cmd-pickup.c so it fits better in the command framework.