Fix for incorrect ThirdFlow plugin replication

Fixes ThirdFlow plugin getting dumped into user plugin demo TWs. Also
minor source code clean-ups.