Cleaning up core: search and contrib: privatemsg in zfzblank