Further cleanup of slot value checking via types