Further fix indentation and mako control from #159.