Re-added the DEBUG_STEPCOUNT and did a temp fix for the lines that broke.  Repetier says he'l fix next commit.