Remove incompatibility issues with UltiSnips