Submitted by: Andy Polyakov <appro@fy.chalmers.se>
The configuration process could use some more clean-ups.