Respect 'ess-continued-statement-offset'; refactor