Reorganized a statement that seemingly mis-behaves in deployed mode.