Lightning Framework Fake Pull Request

I made this PR to myself so that Ioan/Mark can add comments inline if desired.
I use this function in the Lightning class (SimpleSetup child) so can't make this protected.