The solution for BinaryCode was simplified.