comments and typing for StrictReturnValueMap