Fix bugs with watch process

Rebuilding the injected config wasn't working correctly for certain
scenarios. Refactored that area of code...