DRY fixes for Flashlight