Tons of cleanup for E_NOTICE