1 files changed, 12 insertions, 14 deletions
diff --git a/tex/context/base/mkiv/page-lay.mkxl b/tex/context/base/mkiv/page-lay.mkxl
index d24621e60..5eefc8b9a 100644
--- a/tex/context/base/mkiv/page-lay.mkxl
+++ b/tex/context/base/mkiv/page-lay.mkxl
@@ -350,7 +350,7 @@
 
 \permanent\tolerant\protected\def\definepapersize[#1]#*[#2]#*[#3]%
   {\edef\currentlayouttarget{#1}%
-   \ifx\currentlayouttarget\empty
+   \ifempty\currentlayouttarget
      % invalid target
    \orelse\ifhastok={#2}%
      \definelayouttarget[#1][#2]%
@@ -383,14 +383,12 @@
 \permanent\tolerant\protected\def\setuppapersize[#1]#*[#2]%
   {\ifarguments
      \page_paper_restore
-   \or
-     \ifhastok={#1}%
-       \page_paper_setup_size_settings[#1]%
-     \orelse\ifhastok={#2}%
-       \page_paper_setup_size_settings_by_name[#1][#2]%
-     \else
-       \page_paper_setup_size_change_size[#1][#2]%
-     \fi
+   \orelse\ifhastok={#1}%
+     \page_paper_setup_size_settings[#1]%
+   \orelse\ifhastok={#2}%
+     \page_paper_setup_size_settings_by_name[#1][#2]%
+   \else
+     \page_paper_setup_size_change_size[#1][#2]%
    \fi}
 
 \protected\def\page_paper_setup_size_settings[#1]% sometimes used to set paper/print size
@@ -411,10 +409,10 @@
    \fi}
 
 \def\page_paper_setup_size_settings_recalibrate
-  {\ifx\m_layouttarget_paper\empty
+  {\ifempty\m_layouttarget_paper
      % forget about it
    \else
-     \ifx\m_layouttarget_print\empty
+     \ifempty\m_layouttarget_print
         \let\m_layouttarget_print\m_layouttarget_paper
      \fi
      \page_paper_set_current[\m_layouttarget_paper][\m_layouttarget_print]%
@@ -514,7 +512,7 @@
    \let\currentlayouttarget\empty
    \page_paper_reset_paper
    \processcommacommand[\m_page_asked_paper]\page_paper_identify_target
-   \ifx\currentlayouttarget\empty
+   \ifempty\currentlayouttarget
      \let\currentlayouttarget\currentpage
    \fi
    \glet\papersize\currentlayouttarget
@@ -1146,11 +1144,11 @@
   {\textwidth\makeupwidth                          % which is a tricky but valid value
    \edef\m_currentlayout_text_width {\layoutparameter\c!textwidth }%
    \edef\m_currentlayout_text_margin{\layoutparameter\c!textmargin}%
-   \ifx\m_currentlayout_text_width\empty \else
+   \ifempty\m_currentlayout_text_width \else
      \textwidth\m_currentlayout_text_width % local
    \fi
    \global\innermakeupwidth\textwidth
-   \ifx\m_currentlayout_text_margin\empty
+   \ifempty\m_currentlayout_text_margin
      \global\innermakeupmargin\zeropoint
    \else
      \global\innermakeupmargin\m_currentlayout_text_margin\relax