clairvoyance: refactor
authored by Fabian Affolter and committed by GitHub 5 months ago d757c6b0 6109efe5