Add regexp for "where-that" and "remove"