Simplify the demoization process a little