Switch to 1.6 & replace 1.7's <> operators