Further cleanup to resolve a segmentation fault on Travis