webapp/jupyter2: more refactoring
webapp/jupyter2: more refactoring

sagemathinc/smc,DrXyzzy/smc,tscholl2/smc,DrXyzzy/smc,tscholl2/smc,tscholl2/smc,sagemathinc/smc,tscholl2/smc,sagemathinc/smc,tscholl2/smc,DrXyzzy/smc,sagemathinc/smc,DrXyzzy/smc