Factor out Whiskers => WhiskerTree into new source file