Streamlining some debugging code, and symmetric checks.