cleaned up logical AND shortcut spec