UMoria Cleaned up for Modern Compilers