If the execute method returns null, do not apply the fullyQualifiedTemplateName (returning null means to render an empty block).
Minor fixes and clean up.