Cleaning old box pass for easier translation. Another change, this one replaced an error with an assertion based on a comment.