Rename assoc-ops to conj-ops
Move conditional checking to functions