[PATCH configure 0/2]: Minor configure cleanups