Minor efficiency improvements, finegrainify namespacification