Change syntax for defcomp