Fixed subtyping in States
Fixed subtyping defs so that inner product definition will type check
Split complex into versions with and without ring ops