Fixed TAChoice to include missing checks when translated from loops

Also increased readability a bit.