Cleanup, fixes, and language stuff.
Removed unused Constants parameters.