A bit of housekeeping in the spreadsheet editor components

[rubenthoms]

Not fixing all lint warnings yet. Remaining require more investigation of program logic.