Fix $batchedWatch init runs (more like $watch now), minor clean up in $computed