Minor E_STRICT fixes.