Merge changes from glibc obstack; minor cleanups to make it easier to