Improved AMD support when namespace = false