Removed spurious uses of typename keyword in conflict resolving diskmgr.