diff --git a/Rakefile b/Rakefile
index 15d6d088e0..e66f318b3d 100644
--- a/Rakefile
+++ b/Rakefile
@@ -10,6 +10,8 @@ require 'tsort'
 begin
   require 'rubygems'
 rescue LoadError
+  # Don't show RedCloth warning if gems aren't available
+  $redcloth_available = false
 end
 
 task :default => :build
diff --git a/doc/vm/op_codes/set_local.yaml b/doc/vm/op_codes/set_local.yaml
index fabfcc1eb1..fda8cb9e7b 100644
--- a/doc/vm/op_codes/set_local.yaml
+++ b/doc/vm/op_codes/set_local.yaml
@@ -8,10 +8,12 @@ stack_before:
   - value
   - ...
 stack_after:
+  - value
   - ...
 description: >-
-  Pops a value off the stack, and uses it to set the value of the local variable
-  identified by the literal _locl_.
+  Pops _value_ off the stack, and uses it to set the value of the local variable
+  identified by the literal _locl_. The value is then pushed back onto the stack,
+  to represent the return value from the expression.
 source: |-
     next_int;
     t1 = stack_pop();
diff --git a/doc/vm/op_codes/set_local_depth.yaml b/doc/vm/op_codes/set_local_depth.yaml
index 40fc2e4bd0..0cb5e63eec 100644
--- a/doc/vm/op_codes/set_local_depth.yaml
+++ b/doc/vm/op_codes/set_local_depth.yaml
@@ -11,10 +11,9 @@ stack_after:
   - value
   - ...
 description: >-
-  Uses the value on the top of the stack to update the value of the local variable
-  _local_ in an enclosing scope.
-
-  The top of the stack is *not* popped by this operation.
+  Uses the _value_ on the top of the stack to update the value of the local variable
+  _local_ in an enclosing scope. The value is then pushed back onto the stack, to
+  represent the return value from the expression.
 example: |-
   foo.each do |i|
     bar.each do |j|
diff --git a/doc/vm/op_codes/set_local_fp.yaml b/doc/vm/op_codes/set_local_fp.yaml
index 8febfe6da1..4c0b4bd480 100644
--- a/doc/vm/op_codes/set_local_fp.yaml
+++ b/doc/vm/op_codes/set_local_fp.yaml
@@ -11,10 +11,9 @@ stack_after:
   - value
   - ...
 description: >-
-  Uses the value on the top of the stack to update the value of the local variable
-  identified by _idx_.
-    
-  The top of the stack is *not* popped by this operation.    
+  Uses the _value_ on the top of the stack to update the value of the local variable
+  allocated on the stack, identified by _idx_. The value is left on the stack, to
+  represent the return value from the expression.
 notes:
   Local variables that are used within a method and not captured are allocated
   on the stack. This operation updates such a local from the current top of the