Add an alternative rev16 pattern. We should figure out a better way to handle these...