NAMESPACE tweaks for R 3.1