Finished the switch to ScriptProperty.Type. Also made a few other adjustments.