Never mark receive tx ouputs as nonpending
Check max block height
Organize the watcher API's a bit
Replace the watcher with something new