Make install steps invariant of whether or not optional bits are used