renamed convenience flags; use CPP warnings for certain code paths