Update remaining old-style finders [fixes #185]