more using / typedef code cleanups