Don't expect command id after begin/end/error, but keep the old code around with ifdef