Use proper foo-y style list additions to cleanup all the conditionals,
move module selection after compound object selection and remove the
superflous comment.
Signed-off-by: NChristoph Hellwig <hch@lst.de>
Signed-off-by: NAvi Kivity <avi@redhat.com>