Fix Maker.make for all values

64ec6ee is the real issue here. There are a few other small changes getting pulled in as well. Let me know if they are an issue.