Fix installation instructions step list.
Slight code cleanup

Removed some specific references to a specific application of this; made
a bit more general.