Make the listp forms a little neater