Small stdlib cleanups