Updated binarycontexts stuff