Several lines here too long -- hence Travis fail..