Stop extracting strategy methods prematurely. Fixes #122.
Switch to using Bikeshed's header generation.
Minor tweaks to official-lookin' output.
merge