Merged text command and string literal functionality.
Minor TODO changes.