Some more clean-up in ExternalOutput; remove unused variables, rename some stuff for clarity, remove some unnecessary variables.  Zap some commented out code that doesn't look like it's a keeper.