Remove and re-insert some warnings before pull-request is accepted.