Debugging + cleanup

Just a bit of cleanup and debugging.  The biggest change is a re-org of how we create custom Moose types.  If there are no objections over the weekend, I'll merge.