#306856: Optimize code by adding conditional includes; moved block editing code to template.block-editing.inc.