Separate util namespace into redefs and stubs