Fix Moldable types (bad hack); Fix infinite loops in NVP