Updated further-suggestions.cpp to more closely mirror master after code cleanup, to avoid merging headaches. :)