* More lenient StashOf finder * Slightly safer version of the change * Slightly safer version of the change * Tests * Formatting
