Fixes more underscore hygiene issues.
Fixes more underscore hygiene issues.

rwaldron/colony-compiler,rwaldron/colony-compiler,tessel/colony-compiler,tessel/colony-compiler,rwaldron/colony-compiler,rwaldron/colony-compiler