replace Shrs(Shl) with Conv where possible, fix conv_conv optimisation bug