#3922: remove more map references of non static inner classes