Forgot to handle non-special cases.  D'oh!