More work toward simplifying installation.