applied Sanders focus_* patches, removed the unnecessary clean-prefix from the new...