Created attachment 847477 [details]
possible fix for compiler issues
Not sure why the compiler doesn't like some of this stuff (I tried to figure it
out but could not), but this diff makes the compiler happy and hopefully does
not change any functionality.