Another attempt to squash matplotlib tight_layout problems