Fix a reversed short-circuit eval conditional and remove recently commented-out code.