Frob SOAC input representation a little bit.