Various changes.

The rpnesil patch isn't strictly necessary.