Edited statemachine namebinding to resolve varibles and added to-c builders.