Summary: Some #ifndef PRODUCT should be #ifdef ASSERT
Reviewed-by: kvn, twisti
Contributed-by: Ngdub <duboscq@ssw.jku.at>