Define MAKE-{RESOURCE}-ID for resources.
Fix SESSION-RESET.