Tidyup of configure