Edit+: code more defensibly against Viper init
Edit+: code more defensibly against Viper init

jcu-eresearch/matrix-helpers,jcu-eresearch/matrix-helpers,jcu-eresearch/matrix-helpers,jcu-eresearch/matrix-helpers,jcu-eresearch/matrix-helpers