Added local definition for rval to prevent use of global scope.
Added local definition for rval to prevent use of global scope.

cjungmann/schemafw,cjungmann/schemafw,cjungmann/schemafw,cjungmann/schemafw,cjungmann/schemafw