Fix issue with image size not correctly being passed to convolution operator

Closes #2089
Or better, remove this condition and do as @abergeron told, make them always tuple with None instead of just a None.