3060-3066
3053-3058
(input-related 'refactorings' and subsequent bugfixes and squabbling)
reversions went without any merge conflicts, so I think it's OK. your key bindings may be history through, sorry.
there were a lot of lines that needed static_casts to get rid of compiler
errors (c++11 issues) so I added them. Replaced #include<lib.h>s with
#include<clib>s, and moved them below the local includes