Initial changes to eventually support the -a flag.