Some cleanup from fix for #147 (not all tests passed)
Some cleanup from fix for #147 (not all tests passed)

heavenwing/Wyam,adamclifford/Wyam,adamclifford/Wyam,adamclifford/Wyam,adamclifford/Wyam,Wyamio/Wyam,Wyamio/Wyam,heavenwing/Wyam,Wyamio/Wyam,adamclifford/Wyam