Some further R-devel compatibility changes

NAMESPACE work