Make specification language more concise

Remove tree and list as they can be inferred