Move away from different sections for all the installation
methods, and use a table so that it's easier to parse.