Merge `spost -watch' rework.