Finish signal refactor.