Fixing some metaprogramming issues.

Signed-off-by: sigilworks <tj@sigilworks.com>