configure: some small simplifications