Fixes for Terminal code to work with new comma syntax.