Reformat EAPI tables to be more compact.

Combine all lines with identical behaviour for different EAPIs.
Also use consistent indentation for tables in the LaTeX source.

9 files changed, 423 insertions, 592 deletions

diff --git a/dependencies.tex b/dependencies.tex
index 5901ee7..a800264 100644
--- a/dependencies.tex
+++ b/dependencies.tex
@@ -90,38 +90,30 @@ be surrounded on both sides by whitespace, except at the start and end of the st
 In particular, note that whitespace is not optional.
 
 \ChangeWhenAddingAnEAPI{6}
-\begin{centertable}{EAPIs supporting \t{SRC\_URI} arrows} \label{tab:uri-arrows-table}
-    \begin{tabular}{ l l }
-        \toprule
-        \multicolumn{1}{c}{\textbf{EAPI}} &
-        \multicolumn{1}{c}{\textbf{Supports \t{SRC\_URI} arrows?}} \\
-        \midrule
-    \t{0} & No \\
-    \t{1} & No \\
-    \t{2} & Yes \\
-    \t{3} & Yes \\
-    \t{4} & Yes \\
-    \t{5} & Yes \\
-    \t{6} & Yes \\
-    \bottomrule
+\begin{centertable}{EAPIs supporting \t{SRC\_URI} arrows}
+    \label{tab:uri-arrows-table}
+    \begin{tabular}{ll}
+      \toprule
+      \multicolumn{1}{c}{\textbf{EAPI}} &
+      \multicolumn{1}{c}{\textbf{Supports \t{SRC\_URI} arrows?}} \\
+      \midrule
+      0, 1              & No  \\
+      2, 3, 4, 5, 6     & Yes \\
+      \bottomrule
     \end{tabular}
 \end{centertable}
 
 \ChangeWhenAddingAnEAPI{6}
-\begin{centertable}{EAPIs supporting \t{REQUIRED\_USE ??}\ groups} \label{tab:at-most-one-of-table}
-    \begin{tabular}{ l l }
-        \toprule
-        \multicolumn{1}{c}{\textbf{EAPI}} &
-        \multicolumn{1}{c}{\textbf{Supports \t{REQUIRED\_USE ??}\ groups?}} \\
-        \midrule
-    \t{0} & No \\
-    \t{1} & No \\
-    \t{2} & No \\
-    \t{3} & No \\
-    \t{4} & No \\
-    \t{5} & Yes \\
-    \t{6} & Yes \\
-    \bottomrule
+\begin{centertable}{EAPIs supporting \t{REQUIRED\_USE ??}\ groups}
+    \label{tab:at-most-one-of-table}
+    \begin{tabular}{ll}
+      \toprule
+      \multicolumn{1}{c}{\textbf{EAPI}} &
+      \multicolumn{1}{c}{\textbf{Supports \t{REQUIRED\_USE ??}\ groups?}} \\
+      \midrule
+      0, 1, 2, 3, 4     & No  \\
+      5, 6              & Yes \\
+      \bottomrule
     \end{tabular}
 \end{centertable}
 
@@ -194,38 +186,31 @@ manager must warn or error if this feature is used with an EAPI not supporting u
 \ChangeWhenAddingAnEAPI{6}
 \begin{centertable}{Support for \t{SLOT} dependencies and sub-slots in EAPIs}
     \label{tab:slot-deps-table}
-    \begin{tabular}{ l l l }
-        \toprule
-            \multicolumn{1}{c}{\textbf{EAPI}} &
-            \multicolumn{1}{c}{\textbf{Supports \t{SLOT} dependencies?}} &
-            \multicolumn{1}{c}{\textbf{Supports sub-slots?}} \\
-            \midrule
-    \t{0} & No & No \\
-    \t{1} & Named only & No \\
-    \t{2} & Named only & No \\
-    \t{3} & Named only & No \\
-    \t{4} & Named only & No \\
-    \t{5} & Named and operator & Yes \\
-    \t{6} & Named and operator & Yes \\
-    \bottomrule
+    \begin{tabular}{lll}
+      \toprule
+      \multicolumn{1}{c}{\textbf{EAPI}} &
+      \multicolumn{1}{c}{\textbf{Supports \t{SLOT} dependencies?}} &
+      \multicolumn{1}{c}{\textbf{Supports sub-slots?}} \\
+      \midrule
+      0                 & No                 & No  \\
+      1, 2, 3, 4        & Named only         & No  \\
+      5, 6              & Named and operator & Yes \\
+      \bottomrule
     \end{tabular}
 \end{centertable}
 
 \ChangeWhenAddingAnEAPI{6}
-\begin{centertable}{EAPIs supporting \t{USE} dependencies} \label{tab:use-deps-table}
-    \begin{tabular}{ l l }
-        \toprule
-        \multicolumn{1}{c}{\textbf{EAPI}} &
-        \multicolumn{1}{c}{\textbf{Supports \t{USE} dependencies?}} \\
-        \midrule
-    \t{0} & No \\
-    \t{1} & No \\
-    \t{2} & 2-style \\
-    \t{3} & 2-style \\
-    \t{4} & 4-style \\
-    \t{5} & 4-style \\
-    \t{6} & 4-style \\
-    \bottomrule
+\begin{centertable}{EAPIs supporting \t{USE} dependencies}
+    \label{tab:use-deps-table}
+    \begin{tabular}{ll}
+      \toprule
+      \multicolumn{1}{c}{\textbf{EAPI}} &
+      \multicolumn{1}{c}{\textbf{Supports \t{USE} dependencies?}} \\
+      \midrule
+      0, 1              & No      \\
+      2, 3              & 2-style \\
+      4, 5, 6           & 4-style \\
+      \bottomrule
     \end{tabular}
 \end{centertable}
 
@@ -264,21 +249,17 @@ strong block must not be ignored. The mapping from one or two exclamation marks
 described in table~\ref{tab:bang-strength-table}.
 
 \ChangeWhenAddingAnEAPI{6}
-\begin{centertable}{Exclamation mark strengths for EAPIs} \label{tab:bang-strength-table}
-    \begin{tabular}{ l l l }
-        \toprule
-            \multicolumn{1}{c}{\textbf{EAPI}} &
-            \multicolumn{1}{c}{\textbf{\t{!}}} &
-            \multicolumn{1}{c}{\textbf{\t{!!}}} \\
-            \midrule
-    \t{0} & Unspecified & Forbidden \\
-    \t{1} & Unspecified & Forbidden \\
-    \t{2} & Weak & Strong \\
-    \t{3} & Weak & Strong \\
-    \t{4} & Weak & Strong \\
-    \t{5} & Weak & Strong \\
-    \t{6} & Weak & Strong \\
-    \bottomrule
+\begin{centertable}{Exclamation mark strengths for EAPIs}
+    \label{tab:bang-strength-table}
+    \begin{tabular}{lll}
+      \toprule
+      \multicolumn{1}{c}{\textbf{EAPI}} &
+      \multicolumn{1}{c}{\textbf{\t{!}}} &
+      \multicolumn{1}{c}{\textbf{\t{!!}}} \\
+      \midrule
+      0, 1              & Unspecified & Forbidden \\
+      2, 3, 4, 5, 6     & Weak        & Strong    \\
+      \bottomrule
     \end{tabular}
 \end{centertable}
 
diff --git a/ebuild-env-commands.tex b/ebuild-env-commands.tex
index 8b2c146..35f2eff 100644
--- a/ebuild-env-commands.tex
+++ b/ebuild-env-commands.tex
@@ -36,20 +36,16 @@ The following commands must always be available in the ebuild environment:
 \end{compactitem}
 
 \ChangeWhenAddingAnEAPI{6}
-\begin{centertable}{\t{find} implementation for EAPIs} \label{tab:system-commands-table}
-    \begin{tabular}{ l l }
-        \toprule
-            \multicolumn{1}{c}{\textbf{EAPI}} &
-            \multicolumn{1}{c}{\textbf{GNU \t{find}?}} \\
-            \midrule
-    \t{0} & Undefined \\
-    \t{1} & Undefined \\
-    \t{2} & Undefined \\
-    \t{3} & Undefined \\
-    \t{4} & Undefined \\
-    \t{5} & Yes \\
-    \t{6} & Yes \\
-    \bottomrule
+\begin{centertable}{\t{find} implementation for EAPIs}
+    \label{tab:system-commands-table}
+    \begin{tabular}{ll}
+      \toprule
+      \multicolumn{1}{c}{\textbf{EAPI}} &
+      \multicolumn{1}{c}{\textbf{GNU \t{find}?}} \\
+      \midrule
+      0, 1, 2, 3, 4     & Undefined \\
+      5, 6              & Yes       \\
+      \bottomrule
     \end{tabular}
 \end{centertable}
 
diff --git a/ebuild-env-vars.tex b/ebuild-env-vars.tex
index 39a8ccb..8a9be0e 100644
--- a/ebuild-env-vars.tex
+++ b/ebuild-env-vars.tex
@@ -232,63 +232,51 @@ variable.
 \end{landscape}
 
 \ChangeWhenAddingAnEAPI{6}
-\begin{centertable}{EAPIs supporting various added env variables} \label{tab:added-env-vars-table}
-    \begin{tabular}{ l l l l l }
-        \toprule
-        \multicolumn{1}{c}{\textbf{EAPI}} &
-        \multicolumn{1}{c}{\textbf{\t{MERGE\_TYPE}?}} &
-        \multicolumn{1}{c}{\textbf{\t{REPLACING\_VERSIONS}?}} &
-        \multicolumn{1}{c}{\textbf{\t{REPLACED\_BY\_VERSION}?}} &
-        \multicolumn{1}{c}{\textbf{\t{EBUILD\_PHASE\_FUNC}?}} \\
-        \midrule
-    \t{0} & No & No & No & No \\
-    \t{1} & No & No & No & No \\
-    \t{2} & No & No & No & No \\
-    \t{3} & No & No & No & No \\
-    \t{4} & Yes & Yes & Yes & No \\
-    \t{5} & Yes & Yes & Yes & Yes \\
-    \t{6} & Yes & Yes & Yes & Yes \\
-    \bottomrule
+\begin{centertable}{EAPIs supporting various added env variables}
+    \label{tab:added-env-vars-table}
+    \begin{tabular}{lllll}
+      \toprule
+      \multicolumn{1}{c}{\textbf{EAPI}} &
+      \multicolumn{1}{c}{\textbf{\t{MERGE\_TYPE}?}} &
+      \multicolumn{1}{c}{\textbf{\t{REPLACING\_VERSIONS}?}} &
+      \multicolumn{1}{c}{\textbf{\t{REPLACED\_BY\_VERSION}?}} &
+      \multicolumn{1}{c}{\textbf{\t{EBUILD\_PHASE\_FUNC}?}} \\
+      \midrule
+      0, 1, 2, 3        & No  & No  & No  & No  \\
+      4                 & Yes & Yes & Yes & No  \\
+      5, 6              & Yes & Yes & Yes & Yes \\
+      \bottomrule
     \end{tabular}
 \end{centertable}
 
 \ChangeWhenAddingAnEAPI{6}
-\begin{centertable}{EAPIs supporting various removed env variables} \label{tab:removed-env-vars-table}
-    \begin{tabular}{ l l l }
-        \toprule
-        \multicolumn{1}{c}{\textbf{EAPI}} &
-        \multicolumn{1}{c}{\textbf{\t{AA}?}} &
-        \multicolumn{1}{c}{\textbf{\t{KV}?}} \\
-        \midrule
-    \t{0} & Yes & Yes \\
-    \t{1} & Yes & Yes \\
-    \t{2} & Yes & Yes \\
-    \t{3} & Yes & Yes \\
-    \t{4} & No & No \\
-    \t{5} & No & No \\
-    \t{6} & No & No \\
-    \bottomrule
+\begin{centertable}{EAPIs supporting various removed env variables}
+    \label{tab:removed-env-vars-table}
+    \begin{tabular}{lll}
+      \toprule
+      \multicolumn{1}{c}{\textbf{EAPI}} &
+      \multicolumn{1}{c}{\textbf{\t{AA}?}} &
+      \multicolumn{1}{c}{\textbf{\t{KV}?}} \\
+      \midrule
+      0, 1, 2, 3        & Yes & Yes \\
+      4, 5, 6           & No  & No  \\
+      \bottomrule
     \end{tabular}
 \end{centertable}
 
 \ChangeWhenAddingAnEAPI{6}
 \begin{centertable}{EAPIs supporting offset-prefix env variables}
     \label{tab:offset-env-vars-table}
-    \begin{tabular}{ l l l l }
-        \toprule
-        \multicolumn{1}{c}{\textbf{EAPI}} &
-        \multicolumn{1}{c}{\textbf{\t{EPREFIX}?}} &
-        \multicolumn{1}{c}{\textbf{\t{EROOT}?}} &
-        \multicolumn{1}{c}{\textbf{\t{ED}?}} \\
-        \midrule
-        \t{0} & No & No & No \\
-        \t{1} & No & No & No \\
-        \t{2} & No & No & No \\
-        \t{3} & Yes & Yes & Yes \\
-        \t{4} & Yes & Yes & Yes \\
-        \t{5} & Yes & Yes & Yes \\
-        \t{6} & Yes & Yes & Yes \\
-        \bottomrule
+    \begin{tabular}{llll}
+      \toprule
+      \multicolumn{1}{c}{\textbf{EAPI}} &
+      \multicolumn{1}{c}{\textbf{\t{EPREFIX}?}} &
+      \multicolumn{1}{c}{\textbf{\t{EROOT}?}} &
+      \multicolumn{1}{c}{\textbf{\t{ED}?}} \\
+      \midrule
+      0, 1, 2           & No  & No  & No  \\
+      3, 4, 5, 6        & Yes & Yes & Yes \\
+      \bottomrule
     \end{tabular}
 \end{centertable}
 
@@ -391,19 +379,14 @@ contain at most one value.
 \ChangeWhenAddingAnEAPI{6}
 \begin{centertable}{EAPIs supporting offset-prefix}
     \label{tab:offset-support-table}
-    \begin{tabular}{ l l }
-        \toprule
-        \multicolumn{1}{c}{\textbf{EAPI}} &
-        \multicolumn{1}{c}{\textbf{Supports offset-prefix?}}\\
-        \midrule
-        \t{0} & No \\
-        \t{1} & No \\
-        \t{2} & No \\
-        \t{3} & Yes \\
-        \t{4} & Yes \\
-        \t{5} & Yes \\
-        \t{6} & Yes \\
-        \bottomrule
+    \begin{tabular}{ll}
+      \toprule
+      \multicolumn{1}{c}{\textbf{EAPI}} &
+      \multicolumn{1}{c}{\textbf{Supports offset-prefix?}}\\
+      \midrule
+      0, 1, 2           & No  \\
+      3, 4, 5, 6        & Yes \\
+      \bottomrule
     \end{tabular}
 \end{centertable}
 
diff --git a/ebuild-functions.tex b/ebuild-functions.tex
index a4c9144..dcab29e 100644
--- a/ebuild-functions.tex
+++ b/ebuild-functions.tex
@@ -45,20 +45,16 @@ fallback to \t{WORKDIR} is used:
 \end{compactitem}
 
 \ChangeWhenAddingAnEAPI{6}
-\begin{centertable}{EAPIs with \t{S} to \t{WORKDIR} fallbacks} \label{tab:s-fallback-table}
-    \begin{tabular}{ l l }
-        \toprule
-        \multicolumn{1}{c}{\textbf{EAPI}} &
-        \multicolumn{1}{c}{\textbf{Fallback to \t{WORKDIR} permitted?}} \\
-        \midrule
-    \t{0} & Always \\
-    \t{1} & Always \\
-    \t{2} & Always \\
-    \t{3} & Always \\
-    \t{4} & Conditional error \\
-    \t{5} & Conditional error \\
-    \t{6} & Conditional error \\
-    \bottomrule
+\begin{centertable}{EAPIs with \t{S} to \t{WORKDIR} fallbacks}
+    \label{tab:s-fallback-table}
+    \begin{tabular}{ll}
+      \toprule
+      \multicolumn{1}{c}{\textbf{EAPI}} &
+      \multicolumn{1}{c}{\textbf{Fallback to \t{WORKDIR} permitted?}} \\
+      \midrule
+      0, 1, 2, 3        & Always            \\
+      4, 5, 6           & Conditional error \\
+      \bottomrule
     \end{tabular}
 \end{centertable}
 
@@ -81,20 +77,16 @@ before the next phase is executed.
 \t{pkg\_pretend} must not write to the filesystem.
 
 \ChangeWhenAddingAnEAPI{6}
-\begin{centertable}{EAPIs supporting \t{pkg\_pretend}} \label{tab:pkg-pretend-table}
-    \begin{tabular}{ l l }
-        \toprule
-        \multicolumn{1}{c}{\textbf{EAPI}} &
-        \multicolumn{1}{c}{\textbf{Supports \t{pkg\_pretend}?}} \\
-        \midrule
-    \t{0} & No \\
-    \t{1} & No \\
-    \t{2} & No \\
-    \t{3} & No \\
-    \t{4} & Yes \\
-    \t{5} & Yes \\
-    \t{6} & Yes \\
-    \bottomrule
+\begin{centertable}{EAPIs supporting \t{pkg\_pretend}}
+    \label{tab:pkg-pretend-table}
+    \begin{tabular}{ll}
+      \toprule
+      \multicolumn{1}{c}{\textbf{EAPI}} &
+      \multicolumn{1}{c}{\textbf{Supports \t{pkg\_pretend}?}} \\
+      \midrule
+      0, 1, 2, 3        & No  \\
+      4, 5, 6           & Yes \\
+      \bottomrule
     \end{tabular}
 \end{centertable}
 
@@ -141,20 +133,16 @@ The initial working directory is \t{S}, with an error or fallback to \t{WORKDIR}
 section~\ref{sec:s-to-workdir-fallback}.
 
 \ChangeWhenAddingAnEAPI{6}
-\begin{centertable}{EAPIs supporting \t{src\_prepare}} \label{tab:src-prepare-table}
-    \begin{tabular}{ l l }
-        \toprule
-        \multicolumn{1}{c}{\textbf{EAPI}} &
-        \multicolumn{1}{c}{\textbf{Supports \t{src\_prepare}?}} \\
-        \midrule
-    \t{0} & No \\
-    \t{1} & No \\
-    \t{2} & Yes \\
-    \t{3} & Yes \\
-    \t{4} & Yes \\
-    \t{5} & Yes \\
-    \t{6} & Yes \\
-    \bottomrule
+\begin{centertable}{EAPIs supporting \t{src\_prepare}}
+    \label{tab:src-prepare-table}
+    \begin{tabular}{ll}
+      \toprule
+      \multicolumn{1}{c}{\textbf{EAPI}} &
+      \multicolumn{1}{c}{\textbf{Supports \t{src\_prepare}?}} \\
+      \midrule
+      0, 1              & No  \\
+      2, 3, 4, 5, 6     & Yes \\
+      \bottomrule
     \end{tabular}
 \end{centertable}
 
@@ -182,20 +170,16 @@ src_configure() {
 \end{listing}
 
 \ChangeWhenAddingAnEAPI{6}
-\begin{centertable}{EAPIs supporting \t{src\_configure}} \label{tab:src-configure-table}
-    \begin{tabular}{ l l }
-        \toprule
-        \multicolumn{1}{c}{\textbf{EAPI}} &
-        \multicolumn{1}{c}{\textbf{Supports \t{src\_configure}?}} \\
-        \midrule
-    \t{0} & No \\
-    \t{1} & No \\
-    \t{2} & Yes \\
-    \t{3} & Yes \\
-    \t{4} & Yes \\
-    \t{5} & Yes \\
-    \t{6} & Yes \\
-    \bottomrule
+\begin{centertable}{EAPIs supporting \t{src\_configure}}
+    \label{tab:src-configure-table}
+    \begin{tabular}{ll}
+      \toprule
+      \multicolumn{1}{c}{\textbf{EAPI}} &
+      \multicolumn{1}{c}{\textbf{Supports \t{src\_configure}?}} \\
+      \midrule
+      0, 1              & No  \\
+      2, 3, 4, 5, 6     & Yes \\
+      \bottomrule
     \end{tabular}
 \end{centertable}
 
@@ -260,20 +244,17 @@ src_compile() {
 \end{listing}
 
 \ChangeWhenAddingAnEAPI{6}
-\begin{centertable}{\t{src\_compile} behaviour for EAPIs} \label{tab:src-compile-table}
-    \begin{tabular}{ l l }
-        \toprule
-        \multicolumn{1}{c}{\textbf{EAPI}} &
-        \multicolumn{1}{c}{\textbf{Format}} \\
-        \midrule
-    \t{0} & 0 \\
-    \t{1} & 1 \\
-    \t{2} & 2 \\
-    \t{3} & 2 \\
-    \t{4} & 2 \\
-    \t{5} & 2 \\
-    \t{6} & 2 \\
-    \bottomrule
+\begin{centertable}{\t{src\_compile} behaviour for EAPIs}
+    \label{tab:src-compile-table}
+    \begin{tabular}{ll}
+      \toprule
+      \multicolumn{1}{c}{\textbf{EAPI}} &
+      \multicolumn{1}{c}{\textbf{Format}} \\
+      \midrule
+      0                 & 0 \\
+      1                 & 1 \\
+      2, 3, 4, 5, 6     & 2 \\
+      \bottomrule
     \end{tabular}
 \end{centertable}
 
@@ -296,20 +277,16 @@ The \t{src\_test} function may be disabled by \t{RESTRICT}\@. See section~\ref{s
 be disabled by user too, using a PM-specific mechanism.
 
 \ChangeWhenAddingAnEAPI{6}
-\begin{centertable}{\t{src\_test} behaviour for EAPIs} \label{tab:src-test-table}
-    \begin{tabular}{ l l }
-        \toprule
-        \multicolumn{1}{c}{\textbf{EAPI}} &
-        \multicolumn{1}{c}{\textbf{Supports parallel tests?}} \\
-        \midrule
-    \t{0} & No \\
-    \t{1} & No \\
-    \t{2} & No \\
-    \t{3} & No \\
-    \t{4} & No \\
-    \t{5} & Yes \\
-    \t{6} & Yes \\
-    \bottomrule
+\begin{centertable}{\t{src\_test} behaviour for EAPIs}
+    \label{tab:src-test-table}
+    \begin{tabular}{ll}
+      \toprule
+      \multicolumn{1}{c}{\textbf{EAPI}} &
+      \multicolumn{1}{c}{\textbf{Supports parallel tests?}} \\
+      \midrule
+      0, 1, 2, 3, 4     & No  \\
+      5, 6              & Yes \\
+      \bottomrule
     \end{tabular}
 \end{centertable}
 
@@ -353,20 +330,16 @@ For other EAPIs, the default implementation used when the ebuild lacks the \t{sr
 is a no-op.
 
 \ChangeWhenAddingAnEAPI{6}
-\begin{centertable}{\t{src\_install} behaviour for EAPIs} \label{tab:src-install-table}
-    \begin{tabular}{ l l }
-        \toprule
-        \multicolumn{1}{c}{\textbf{EAPI}} &
-        \multicolumn{1}{c}{\textbf{Format}} \\
-        \midrule
-    \t{0} & no-op \\
-    \t{1} & no-op \\
-    \t{2} & no-op \\
-    \t{3} & no-op \\
-    \t{4} & 4 \\
-    \t{5} & 4 \\
-    \t{6} & 4 \\
-    \bottomrule
+\begin{centertable}{\t{src\_install} behaviour for EAPIs}
+    \label{tab:src-install-table}
+    \begin{tabular}{ll}
+      \toprule
+      \multicolumn{1}{c}{\textbf{EAPI}} &
+      \multicolumn{1}{c}{\textbf{Format}} \\
+      \midrule
+      0, 1, 2, 3        & no-op \\
+      4, 5, 6           & 4     \\
+      \bottomrule
     \end{tabular}
 \end{centertable}
 
@@ -430,20 +403,16 @@ that dependencies may not be installed.
 \t{pkg\_info} must not write to the filesystem.
 
 \ChangeWhenAddingAnEAPI{6}
-\begin{centertable}{EAPIs supporting \t{pkg\_info} on non-installed packages} \label{tab:pkg-info-table}
-    \begin{tabular}{ l l }
-        \toprule
-        \multicolumn{1}{c}{\textbf{EAPI}} &
-        \multicolumn{1}{c}{\textbf{Supports \t{pkg\_info} on non-installed packages?}} \\
-        \midrule
-    \t{0} & No \\
-    \t{1} & No \\
-    \t{2} & No \\
-    \t{3} & No \\
-    \t{4} & Yes \\
-    \t{5} & Yes \\
-    \t{6} & Yes \\
-    \bottomrule
+\begin{centertable}{EAPIs supporting \t{pkg\_info} on non-installed packages}
+    \label{tab:pkg-info-table}
+    \begin{tabular}{ll}
+      \toprule
+      \multicolumn{1}{c}{\textbf{EAPI}} &
+      \multicolumn{1}{c}{\textbf{Supports \t{pkg\_info} on non-installed packages?}} \\
+      \midrule
+      0, 1, 2, 3        & No  \\
+      4, 5, 6           & Yes \\
+      \bottomrule
     \end{tabular}
 \end{centertable}
 
@@ -466,25 +435,19 @@ when executing any ebuild phase listed in the table. Ebuilds must not call these
 when in the phase in question.
 
 \ChangeWhenAddingAnEAPI{6}
-\begin{centertable}{EAPIs supporting \t{default\_} phase functions} \label{tab:default-phase-function-table}
-    \begin{tabular}{ l >{\setlength{\rightskip}{0pt plus 1fil}}p{30em} }
-        \toprule
-            \multicolumn{1}{c}{\textbf{EAPI}} &
-            \multicolumn{1}{c}{\textbf{Supports \t{default\_} functions in phases}} \\
-            \midrule
-    \t{0} & None \\
-    \t{1} & None \\
-    \t{2} & \t{pkg\_nofetch}, \t{src\_unpack}, \t{src\_prepare}, \t{src\_configure},
-        \t{src\_compile}, \t{src\_test} \\
-    \t{3} & \t{pkg\_nofetch}, \t{src\_unpack}, \t{src\_prepare}, \t{src\_configure},
-        \t{src\_compile}, \t{src\_test} \\
-    \t{4} & \t{pkg\_nofetch}, \t{src\_unpack}, \t{src\_prepare}, \t{src\_configure},
-        \t{src\_compile}, \t{src\_install}, \t{src\_test} \\
-    \t{5} & \t{pkg\_nofetch}, \t{src\_unpack}, \t{src\_prepare}, \t{src\_configure},
-        \t{src\_compile}, \t{src\_install}, \t{src\_test} \\
-    \t{6} & \t{pkg\_nofetch}, \t{src\_unpack}, \t{src\_prepare}, \t{src\_configure},
-        \t{src\_compile}, \t{src\_install}, \t{src\_test} \\
-    \bottomrule
+\begin{centertable}{EAPIs supporting \t{default\_} phase functions}
+    \label{tab:default-phase-function-table}
+    \begin{tabular}{l P{26em}}
+      \toprule
+      \multicolumn{1}{c}{\textbf{EAPI}} &
+      \multicolumn{1}{c}{\textbf{Supports \t{default\_} functions in phases}} \\
+      \midrule
+      0, 1              & None \\
+      2, 3              & \t{pkg\_nofetch}, \t{src\_unpack}, \t{src\_prepare}, \t{src\_configure},
+                          \t{src\_compile}, \t{src\_test} \\
+      4, 5, 6           & \t{pkg\_nofetch}, \t{src\_unpack}, \t{src\_prepare}, \t{src\_configure},
+                          \t{src\_compile}, \t{src\_install}, \t{src\_test} \\
+      \bottomrule
     \end{tabular}
 \end{centertable}
 
diff --git a/ebuild-vars.tex b/ebuild-vars.tex
index 0bba597..43ce528 100644
--- a/ebuild-vars.tex
+++ b/ebuild-vars.tex
@@ -85,40 +85,31 @@ Ebuilds may define any of the following variables:
 \end{description}
 
 \ChangeWhenAddingAnEAPI{6}
-\begin{centertable}{EAPIs supporting \t{IUSE} defaults} \label{tab:iuse-defaults-table}
-    \begin{tabular}{ l l }
-        \toprule
-        \multicolumn{1}{c}{\textbf{EAPI}} &
-        \multicolumn{1}{c}{\textbf{Supports \t{IUSE} defaults?}} \\
-        \midrule
-    \t{0} & No \\
-    \t{1} & Yes \\
-    \t{2} & Yes \\
-    \t{3} & Yes \\
-    \t{4} & Yes \\
-    \t{5} & Yes \\
-    \t{6} & Yes \\
-    \bottomrule
+\begin{centertable}{EAPIs supporting \t{IUSE} defaults}
+    \label{tab:iuse-defaults-table}
+    \begin{tabular}{ll}
+      \toprule
+      \multicolumn{1}{c}{\textbf{EAPI}} &
+      \multicolumn{1}{c}{\textbf{Supports \t{IUSE} defaults?}} \\
+      \midrule
+      0                 & No  \\
+      1, 2, 3, 4, 5, 6  & Yes \\
+      \bottomrule
     \end{tabular}
 \end{centertable}
 
 \ChangeWhenAddingAnEAPI{6}
 \begin{centertable}{EAPIs supporting various ebuild-defined variables}
-\label{tab:optional-vars-table}
-    \begin{tabular}{ l l l }
-        \toprule
-        \multicolumn{1}{c}{\textbf{EAPI}} &
-        \multicolumn{1}{c}{\textbf{Supports \t{PROPERTIES}?}} &
-        \multicolumn{1}{c}{\textbf{Supports \t{REQUIRED\_USE}?}} \\
-        \midrule
-    \t{0} & Optionally & No \\
-    \t{1} & Optionally & No \\
-    \t{2} & Optionally & No \\
-    \t{3} & Optionally & No \\
-    \t{4} & Yes & Yes \\
-    \t{5} & Yes & Yes \\
-    \t{6} & Yes & Yes \\
-    \bottomrule
+    \label{tab:optional-vars-table}
+    \begin{tabular}{lll}
+      \toprule
+      \multicolumn{1}{c}{\textbf{EAPI}} &
+      \multicolumn{1}{c}{\textbf{Supports \t{PROPERTIES}?}} &
+      \multicolumn{1}{c}{\textbf{Supports \t{REQUIRED\_USE}?}} \\
+      \midrule
+      0, 1, 2, 3        & Optionally & No  \\
+      4, 5, 6           & Yes        & Yes \\
+      \bottomrule
     \end{tabular}
 \end{centertable}
 
@@ -186,20 +177,16 @@ the ebuild portion, and any \t{DEPEND} value set in an eclass does not get treat
 \t{RDEPEND}.
 
 \ChangeWhenAddingAnEAPI{6}
-\begin{centertable}{EAPIs with \t{RDEPEND=DEPEND} Default} \label{tab:rdepend-depend-table}
-    \begin{tabular}{ l l }
-        \toprule
-        \multicolumn{1}{c}{\textbf{EAPI}} &
-        \multicolumn{1}{c}{\textbf{\t{RDEPEND=DEPEND}?}} \\
-        \midrule
-    \t{0} & Yes \\
-    \t{1} & Yes \\
-    \t{2} & Yes \\
-    \t{3} & Yes \\
-    \t{4} & No \\
-    \t{5} & No \\
-    \t{6} & No \\
-    \bottomrule
+\begin{centertable}{EAPIs with \t{RDEPEND=DEPEND} Default}
+    \label{tab:rdepend-depend-table}
+    \begin{tabular}{ll}
+      \toprule
+      \multicolumn{1}{c}{\textbf{EAPI}} &
+      \multicolumn{1}{c}{\textbf{\t{RDEPEND=DEPEND}?}} \\
+      \midrule
+      0, 1, 2, 3        & Yes \\
+      4, 5, 6           & No  \\
+      \bottomrule
     \end{tabular}
 \end{centertable}
 
@@ -233,20 +220,16 @@ this variable defined, and must treat an empty string as ``this information is n
 based upon any variant condition.
 
 \ChangeWhenAddingAnEAPI{6}
-\begin{centertable}{EAPIs supporting \t{DEFINED\_PHASES}} \label{tab:defined-phases-table}
-    \begin{tabular}{ l l }
-        \toprule
-        \multicolumn{1}{c}{\textbf{EAPI}} &
-        \multicolumn{1}{c}{\textbf{Supports \t{DEFINED\_PHASES}?}} \\
-        \midrule
-    \t{0} & Optionally \\
-    \t{1} & Optionally \\
-    \t{2} & Optionally \\
-    \t{3} & Optionally \\
-    \t{4} & Yes \\
-    \t{5} & Yes \\
-    \t{6} & Yes \\
-    \bottomrule
+\begin{centertable}{EAPIs supporting \t{DEFINED\_PHASES}}
+    \label{tab:defined-phases-table}
+    \begin{tabular}{ll}
+      \toprule
+      \multicolumn{1}{c}{\textbf{EAPI}} &
+      \multicolumn{1}{c}{\textbf{Supports \t{DEFINED\_PHASES}?}} \\
+      \midrule
+      0, 1, 2, 3        & Optionally \\
+      4, 5, 6           & Yes        \\
+      \bottomrule
     \end{tabular}
 \end{centertable}
 
diff --git a/merge.tex b/merge.tex
index 1180c8c..9da9631 100644
--- a/merge.tex
+++ b/merge.tex
@@ -89,19 +89,14 @@ is undefined.
 \ChangeWhenAddingAnEAPI{6}
 \begin{centertable}{Preservation of file modification times (mtimes)}
     \label{tab:mtime-preserve}
-    \begin{tabular}{ l l }
-        \toprule
-            \multicolumn{1}{c}{\textbf{EAPI}} &
-            \multicolumn{1}{c}{\textbf{mtimes preserved?}} \\
-            \midrule
-    \t{0} & Undefined \\
-    \t{1} & Undefined \\
-    \t{2} & Undefined \\
-    \t{3} & Yes \\
-    \t{4} & Yes \\
-    \t{5} & Yes \\
-    \t{6} & Yes \\
-    \bottomrule
+    \begin{tabular}{ll}
+      \toprule
+      \multicolumn{1}{c}{\textbf{EAPI}} &
+      \multicolumn{1}{c}{\textbf{mtimes preserved?}} \\
+      \midrule
+      0, 1, 2           & Undefined \\
+      3, 4, 5, 6        & Yes       \\
+      \bottomrule
     \end{tabular}
 \end{centertable}
 
diff --git a/pkg-mgr-commands.tex b/pkg-mgr-commands.tex
index ebafe99..2fcc51e 100644
--- a/pkg-mgr-commands.tex
+++ b/pkg-mgr-commands.tex
@@ -24,21 +24,17 @@ The following commands affect this behaviour:
 \end{description}
 
 \ChangeWhenAddingAnEAPI{6}
-\begin{centertable}{EAPI Command Failure Behaviour} \label{tab:commands-die-table}
-    \begin{tabular}{ l l l }
-        \toprule
-            \multicolumn{1}{c}{\textbf{EAPI}} &
-            \multicolumn{1}{c}{\textbf{Command failure behaviour}} &
-            \multicolumn{1}{c}{\textbf{Supports \t{nonfatal}?}} \\
-            \midrule
-    \t{0} & Non-zero exit & No \\
-    \t{1} & Non-zero exit & No \\
-    \t{2} & Non-zero exit & No \\
-    \t{3} & Non-zero exit & No \\
-    \t{4} & Aborts & Yes \\
-    \t{5} & Aborts & Yes \\
-    \t{6} & Aborts & Yes \\
-    \bottomrule
+\begin{centertable}{EAPI Command Failure Behaviour}
+    \label{tab:commands-die-table}
+    \begin{tabular}{lll}
+      \toprule
+      \multicolumn{1}{c}{\textbf{EAPI}} &
+      \multicolumn{1}{c}{\textbf{Command failure behaviour}} &
+      \multicolumn{1}{c}{\textbf{Supports \t{nonfatal}?}} \\
+      \midrule
+      0, 1, 2, 3        & Non-zero exit & No  \\
+      4, 5, 6           & Aborts        & Yes \\
+      \bottomrule
     \end{tabular}
 \end{centertable}
 
@@ -49,23 +45,19 @@ The following commands affect this behaviour:
 called, the package manager must abort the build process indicating an error.
 
 \ChangeWhenAddingAnEAPI{6}
-\begin{centertable}{Banned commands} \label{tab:banned-commands-table}
-    \begin{tabular}{ l l l }
-        \toprule
-        \multicolumn{1}{c}{\textbf{EAPI}} &
-        \multicolumn{2}{c}{\textbf{Command banned?}} \\
-        \multicolumn{1}{c}{} &
-        \multicolumn{1}{c}{\textbf{\t{dohard}}} &
-        \multicolumn{1}{c}{\textbf{\t{dosed}}} \\
-        \midrule
-    \t{0} & No & No \\
-    \t{1} & No & No \\
-    \t{2} & No & No \\
-    \t{3} & No & No \\
-    \t{4} & Yes & Yes \\
-    \t{5} & Yes & Yes \\
-    \t{6} & Yes & Yes \\
-    \bottomrule
+\begin{centertable}{Banned commands}
+    \label{tab:banned-commands-table}
+    \begin{tabular}{lll}
+      \toprule
+      \multicolumn{1}{c}{\textbf{EAPI}} &
+      \multicolumn{2}{c}{\textbf{Command banned?}} \\
+      \multicolumn{1}{c}{} &
+      \multicolumn{1}{c}{\textbf{\t{dohard}}} &
+      \multicolumn{1}{c}{\textbf{\t{dosed}}} \\
+      \midrule
+      0, 1, 2, 3        & No  & No  \\
+      4, 5, 6           & Yes & Yes \\
+      \bottomrule
     \end{tabular}
 \end{centertable}
 
@@ -162,21 +154,18 @@ current phase function has returned.
     \end{itemize}
 
     \ChangeWhenAddingAnEAPI{6}
-    \begin{centertable}{Extra \t{econf} arguments for EAPIs} \label{tab:econf-options-table}
-        \begin{tabular}{ l l l }
-            \toprule
-                \multicolumn{1}{c}{\textbf{EAPI}} &
-                \multicolumn{1}{c}{\textbf{-{}-disable-dependency-tracking}?} &
-                \multicolumn{1}{c}{\textbf{-{}-disable-silent-rules}?} \\
-                \midrule
-        \t{0} & No & No \\
-        \t{1} & No & No \\
-        \t{2} & No & No \\
-        \t{3} & No & No \\
-        \t{4} & Yes & No \\
-        \t{5} & Yes & Yes \\
-        \t{6} & Yes & Yes \\
-        \bottomrule
+    \begin{centertable}{Extra \t{econf} arguments for EAPIs}
+        \label{tab:econf-options-table}
+        \begin{tabular}{lll}
+          \toprule
+          \multicolumn{1}{c}{\textbf{EAPI}} &
+          \multicolumn{1}{c}{\textbf{-{}-disable-dependency-tracking?}} &
+          \multicolumn{1}{c}{\textbf{-{}-disable-silent-rules?}} \\
+          \midrule
+          0, 1, 2, 3        & No  & No  \\
+          4                 & Yes & No  \\
+          5, 6              & Yes & Yes \\
+          \bottomrule
         \end{tabular}
     \end{centertable}
 
@@ -441,113 +430,88 @@ can be extended or reduced (see below). The options that can be passed to \t{doh
 \end{description}
 
 \ChangeWhenAddingAnEAPI{6}
-\begin{centertable}{EAPIs supporting \t{dodoc -r}} \label{tab:dodoc-table}
-    \begin{tabular}{ l l }
-        \toprule
-            \multicolumn{1}{c}{\textbf{EAPI}} &
-            \multicolumn{1}{c}{\textbf{Supports \t{dodoc -r}?}} \\
-            \midrule
-    \t{0} & No \\
-    \t{1} & No \\
-    \t{2} & No \\
-    \t{3} & No \\
-    \t{4} & Yes \\
-    \t{5} & Yes \\
-    \t{6} & Yes \\
-    \bottomrule
+\begin{centertable}{EAPIs supporting \t{dodoc -r}}
+    \label{tab:dodoc-table}
+    \begin{tabular}{ll}
+      \toprule
+      \multicolumn{1}{c}{\textbf{EAPI}} &
+      \multicolumn{1}{c}{\textbf{Supports \t{dodoc -r}?}} \\
+      \midrule
+      0, 1, 2, 3        & No  \\
+      4, 5, 6           & Yes \\
+      \bottomrule
     \end{tabular}
 \end{centertable}
 
 \ChangeWhenAddingAnEAPI{6}
-\begin{centertable}{EAPIs supporting \t{doheader} and \t{newheader}} \label{tab:doheader-table}
-    \begin{tabular}{ l l }
-        \toprule
-            \multicolumn{1}{c}{\textbf{EAPI}} &
-            \multicolumn{1}{c}{\textbf{Supports \t{doheader} and \t{newheader}?}} \\
-            \midrule
-    \t{0} & No \\
-    \t{1} & No \\
-    \t{2} & No \\
-    \t{3} & No \\
-    \t{4} & No \\
-    \t{5} & Yes \\
-    \t{6} & Yes \\
-    \bottomrule
+\begin{centertable}{EAPIs supporting \t{doheader} and \t{newheader}}
+    \label{tab:doheader-table}
+    \begin{tabular}{ll}
+      \toprule
+      \multicolumn{1}{c}{\textbf{EAPI}} &
+      \multicolumn{1}{c}{\textbf{Supports \t{doheader} and \t{newheader}?}} \\
+      \midrule
+      0, 1, 2, 3, 4     & No  \\
+      5, 6              & Yes \\
+      \bottomrule
     \end{tabular}
 \end{centertable}
 
 \ChangeWhenAddingAnEAPI{6}
-\begin{centertable}{EAPIs supporting symlinks for \t{doins}} \label{tab:doins-table}
-    \begin{tabular}{ l l }
-        \toprule
-            \multicolumn{1}{c}{\textbf{EAPI}} &
-            \multicolumn{1}{c}{\textbf{\t{doins} supports symlinks?}} \\
-            \midrule
-    \t{0} & No \\
-    \t{1} & No \\
-    \t{2} & No \\
-    \t{3} & No \\
-    \t{4} & Yes \\
-    \t{5} & Yes \\
-    \t{6} & Yes \\
-    \bottomrule
+\begin{centertable}{EAPIs supporting symlinks for \t{doins}}
+    \label{tab:doins-table}
+    \begin{tabular}{ll}
+      \toprule
+      \multicolumn{1}{c}{\textbf{EAPI}} &
+      \multicolumn{1}{c}{\textbf{\t{doins} supports symlinks?}} \\
+      \midrule
+      0, 1, 2, 3        & No  \\
+      4, 5, 6           & Yes \\
+      \bottomrule
     \end{tabular}
 \end{centertable}
 
 \ChangeWhenAddingAnEAPI{6}
 \begin{centertable}{\t{doman} language support options for EAPIs}
     \label{tab:doman-table}
-    \begin{tabular}{ l l l }
-        \toprule
-            \multicolumn{1}{c}{\textbf{EAPI}} &
-            \multicolumn{1}{c}{\textbf{Language detection by filename?}} &
-            \multicolumn{1}{c}{\textbf{Option \t{-i18n} takes precedence?}} \\
-            \midrule
-    \t{0} & No & Not applicable \\
-    \t{1} & No & Not applicable \\
-    \t{2} & Yes & No \\
-    \t{3} & Yes & No \\
-    \t{4} & Yes & Yes \\
-    \t{5} & Yes & Yes \\
-    \t{6} & Yes & Yes \\
-    \bottomrule
+    \begin{tabular}{lll}
+      \toprule
+      \multicolumn{1}{c}{\textbf{EAPI}} &
+      \multicolumn{1}{c}{\textbf{Language detection by filename?}} &
+      \multicolumn{1}{c}{\textbf{Option \t{-i18n} takes precedence?}} \\
+      \midrule
+      0, 1              & No  & Not applicable \\
+      2, 3              & Yes & No             \\
+      4, 5, 6           & Yes & Yes            \\
+      \bottomrule
     \end{tabular}
 \end{centertable}
 
 \ChangeWhenAddingAnEAPI{6}
-\begin{centertable}{EAPIs supporting stdin for \t{new*} commands} \label{tab:newfoo-stdin-table}
-    \begin{tabular}{ l l }
-        \toprule
-            \multicolumn{1}{c}{\textbf{EAPI}} &
-            \multicolumn{1}{c}{\textbf{\t{new*} can read from stdin?}} \\
-            \midrule
-    \t{0} & No \\
-    \t{1} & No \\
-    \t{2} & No \\
-    \t{3} & No \\
-    \t{4} & No \\
-    \t{5} & Yes \\
-    \t{6} & Yes \\
-    \bottomrule
+\begin{centertable}{EAPIs supporting stdin for \t{new*} commands}
+    \label{tab:newfoo-stdin-table}
+    \begin{tabular}{ll}
+      \toprule
+      \multicolumn{1}{c}{\textbf{EAPI}} &
+      \multicolumn{1}{c}{\textbf{\t{new*} can read from stdin?}} \\
+      \midrule
+      0, 1, 2, 3, 4     & No  \\
+      5, 6              & Yes \\
+      \bottomrule
     \end{tabular}
 \end{centertable}
 
 \ChangeWhenAddingAnEAPI{6}
 \begin{centertable}{EAPIs supporting \t{-{}-host-root} for \t{*\_version} commands}
     \label{tab:foo-version-host-root-table}
-    \begin{tabular}{ l l }
-        \toprule
-            \multicolumn{1}{c}{\textbf{EAPI}} &
-            \multicolumn{1}{c}{\textbf{\t{*\_version} supports \t{-{}-host-root}?}} \\
-            \midrule
-    \t{0} & No \\
-    \t{1} & No \\
-    \t{2} & No \\
-    \t{3} & No \\
-    \t{4} & No \\
-    \t{5} & Yes \\
-    \t{6} & Yes \\
-    \bottomrule
+    \begin{tabular}{ll}
+      \toprule
+      \multicolumn{1}{c}{\textbf{EAPI}} &
+      \multicolumn{1}{c}{\textbf{\t{*\_version} supports \t{-{}-host-root}?}} \\
+      \midrule
+      0, 1, 2, 3, 4     & No  \\
+      5, 6              & Yes \\
+      \bottomrule
     \end{tabular}
 \end{centertable}
 
@@ -637,21 +601,17 @@ in table~\ref{tab:compression-table} as supporting \t{docompress}.
 \end{description}
 
 \ChangeWhenAddingAnEAPI{6}
-\begin{centertable}{EAPIs supporting controllable compression} \label{tab:compression-table}
-    \begin{tabular}{ l l l }
-        \toprule
-            \multicolumn{1}{c}{\textbf{EAPI}} &
-            \multicolumn{1}{c}{\textbf{Supports controllable compression?}} &
-            \multicolumn{1}{c}{\textbf{Supports \t{docompress}?}} \\
-            \midrule
-    \t{0} & No & No \\
-    \t{1} & No & No \\
-    \t{2} & No & No \\
-    \t{3} & No & No \\
-    \t{4} & Yes & Yes \\
-    \t{5} & Yes & Yes \\
-    \t{6} & Yes & Yes \\
-    \bottomrule
+\begin{centertable}{EAPIs supporting controllable compression}
+    \label{tab:compression-table}
+    \begin{tabular}{lll}
+      \toprule
+      \multicolumn{1}{c}{\textbf{EAPI}} &
+      \multicolumn{1}{c}{\textbf{Supports controllable compression?}} &
+      \multicolumn{1}{c}{\textbf{Supports \t{docompress}?}} \\
+      \midrule
+      0, 1, 2, 3        & No  & No  \\
+      4, 5, 6           & Yes & Yes \\
+      \bottomrule
     \end{tabular}
 \end{centertable}
 
@@ -690,57 +650,44 @@ either behaviour is undefined or it is an error as decided by table~\ref{tab:use
 \end{description}
 
 \ChangeWhenAddingAnEAPI{6}
-\begin{centertable}{EAPI Behaviour for Use Queries not in IUSE\_EFFECTIVE} \label{tab:use-list-strictness}
-    \begin{tabular}{ l l }
-        \toprule
-            \multicolumn{1}{c}{\textbf{EAPI}} &
-            \multicolumn{1}{c}{\textbf{Behaviour}} \\
-            \midrule
-    \t{0} & Undefined \\
-    \t{1} & Undefined  \\
-    \t{2} & Undefined \\
-    \t{3} & Undefined \\
-    \t{4} & Error \\
-    \t{5} & Error \\
-    \t{6} & Error \\
-    \bottomrule
+\begin{centertable}{EAPI Behaviour for Use Queries not in IUSE\_EFFECTIVE}
+    \label{tab:use-list-strictness}
+    \begin{tabular}{ll}
+      \toprule
+      \multicolumn{1}{c}{\textbf{EAPI}} &
+      \multicolumn{1}{c}{\textbf{Behaviour}} \\
+      \midrule
+      0, 1, 2, 3        & Undefined \\
+      4, 5, 6           & Error     \\
+      \bottomrule
     \end{tabular}
 \end{centertable}
 
 \ChangeWhenAddingAnEAPI{6}
 \begin{centertable}{EAPIs supporting empty third argument in \t{use\_with} and \t{use\_enable}}
     \label{tab:use-with-third-arg}
-    \begin{tabular}{ l l }
-        \toprule
-            \multicolumn{1}{c}{\textbf{EAPI}} &
-            \multicolumn{1}{c}{\textbf{Supports empty third argument?}} \\
-            \midrule
-    \t{0} & No \\
-    \t{1} & No \\
-    \t{2} & No \\
-    \t{3} & No \\
-    \t{4} & Yes \\
-    \t{5} & Yes \\
-    \t{6} & Yes \\
-    \bottomrule
+    \begin{tabular}{ll}
+      \toprule
+      \multicolumn{1}{c}{\textbf{EAPI}} &
+      \multicolumn{1}{c}{\textbf{Supports empty third argument?}} \\
+      \midrule
+      0, 1, 2, 3        & No  \\
+      4, 5, 6           & Yes \\
+      \bottomrule
     \end{tabular}
 \end{centertable}
 
 \ChangeWhenAddingAnEAPI{6}
-\begin{centertable}{EAPIs supporting \t{usex}} \label{tab:usex-table}
-    \begin{tabular}{ l l }
-        \toprule
-            \multicolumn{1}{c}{\textbf{EAPI}} &
-            \multicolumn{1}{c}{\textbf{Supports \t{usex}?}} \\
-            \midrule
-    \t{0} & No \\
-    \t{1} & No \\
-    \t{2} & No \\
-    \t{3} & No \\
-    \t{4} & No \\
-    \t{5} & Yes \\
-    \t{6} & Yes \\
-    \bottomrule
+\begin{centertable}{EAPIs supporting \t{usex}}
+    \label{tab:usex-table}
+    \begin{tabular}{ll}
+      \toprule
+      \multicolumn{1}{c}{\textbf{EAPI}} &
+      \multicolumn{1}{c}{\textbf{Supports \t{usex}?}} \\
+      \midrule
+      0, 1, 2, 3, 4     & No  \\
+      5, 6              & Yes \\
+      \bottomrule
     \end{tabular}
 \end{centertable}
 
@@ -810,23 +757,19 @@ has returned.
     It is up to the ebuild to ensure that the relevant external utilities are available, whether by
     being in the system set or via dependencies.
 
-\ChangeWhenAddingAnEAPI{6}
-\begin{centertable}{\t{unpack} extensions for EAPIs} \label{tab:unpack-extensions-table}
-    \begin{tabular}{ l l }
-        \toprule
-            \multicolumn{1}{c}{\textbf{EAPI}} &
-            \multicolumn{1}{c}{\textbf{\t{.xz} and \t{.tar.xz}?}} \\
-            \midrule
-    \t{0} & No \\
-    \t{1} & No \\
-    \t{2} & No \\
-    \t{3} & Yes \\
-    \t{4} & Yes \\
-    \t{5} & Yes \\
-    \t{6} & Yes \\
-    \bottomrule
-    \end{tabular}
-\end{centertable}
+    \ChangeWhenAddingAnEAPI{6}
+    \begin{centertable}{\t{unpack} extensions for EAPIs}
+        \label{tab:unpack-extensions-table}
+        \begin{tabular}{ll}
+          \toprule
+          \multicolumn{1}{c}{\textbf{EAPI}} &
+          \multicolumn{1}{c}{\textbf{\t{.xz} and \t{.tar.xz}?}} \\
+          \midrule
+          0, 1, 2           & No  \\
+          3, 4, 5, 6        & Yes \\
+          \bottomrule
+        \end{tabular}
+    \end{centertable}
 
 \item[inherit] See section~\ref{sec:inherit}.
 
@@ -838,20 +781,16 @@ has returned.
 \end{description}
 
 \ChangeWhenAddingAnEAPI{6}
-\begin{centertable}{EAPIs supporting the \t{default} function} \label{tab:default-function-table}
-    \begin{tabular}{ l l }
-        \toprule
-            \multicolumn{1}{c}{\textbf{EAPI}} &
-            \multicolumn{1}{c}{\textbf{Supports \t{default} function?}} \\
-            \midrule
-    \t{0} & No \\
-    \t{1} & No \\
-    \t{2} & Yes \\
-    \t{3} & Yes \\
-    \t{4} & Yes \\
-    \t{5} & Yes \\
-    \t{6} & Yes \\
-    \bottomrule
+\begin{centertable}{EAPIs supporting the \t{default} function}
+    \label{tab:default-function-table}
+    \begin{tabular}{ll}
+      \toprule
+      \multicolumn{1}{c}{\textbf{EAPI}} &
+      \multicolumn{1}{c}{\textbf{Supports \t{default} function?}} \\
+      \midrule
+      0, 1              & No  \\
+      2, 3, 4, 5, 6     & Yes \\
+      \bottomrule
     \end{tabular}
 \end{centertable}
 
diff --git a/profile-variables.tex b/profile-variables.tex
index 4c5496c..c47b748 100644
--- a/profile-variables.tex
+++ b/profile-variables.tex
@@ -34,20 +34,16 @@ Portage's \t{FEATURES} variable), must not be treated incrementally---later defi
 completely override those in parent profiles.
 
 \ChangeWhenAddingAnEAPI{6}
-\begin{centertable}{Profile-defined \t{IUSE} injection for EAPIs} \label{tab:profile-iuse-injection-table}
-    \begin{tabular}{ l l }
-        \toprule
-        \multicolumn{1}{c}{\textbf{EAPI}} &
-        \multicolumn{1}{c}{\textbf{Supports profile-defined \t{IUSE} injection?}} \\
-        \midrule
-    \t{0} & No \\
-    \t{1} & No \\
-    \t{2} & No \\
-    \t{3} & No \\
-    \t{4} & No \\
-    \t{5} & Yes \\
-    \t{6} & Yes \\
-    \bottomrule
+\begin{centertable}{Profile-defined \t{IUSE} injection for EAPIs}
+    \label{tab:profile-iuse-injection-table}
+    \begin{tabular}{ll}
+      \toprule
+      \multicolumn{1}{c}{\textbf{EAPI}} &
+      \multicolumn{1}{c}{\textbf{Supports profile-defined \t{IUSE} injection?}} \\
+      \midrule
+      0, 1, 2, 3, 4     & No  \\
+      5, 6              & Yes \\
+      \bottomrule
     \end{tabular}
 \end{centertable}
 
diff --git a/profiles.tex b/profiles.tex
index 1048162..c677582 100644
--- a/profiles.tex
+++ b/profiles.tex
@@ -126,21 +126,16 @@ subsection~\ref{sec:keywords}. Thus, these files can be used to restrict the fea
 stable in a package.
 
 \ChangeWhenAddingAnEAPI{6}
-\begin{centertable}{Profile directory support for masking/forcing use flags in stable
-versions only}\label{tab:profile-stablemask}
-    \begin{tabular}{ l l }
-        \toprule
-        \multicolumn{1}{c}{\textbf{EAPI}} &
-        \multicolumn{1}{c}{\textbf{Supports masking/forcing use flags in stable versions?}} \\
-        \midrule
-    \t{0} & No \\
-    \t{1} & No \\
-    \t{2} & No \\
-    \t{3} & No \\
-    \t{4} & No \\
-    \t{5} & Yes \\
-    \t{6} & Yes \\
-    \bottomrule
+\begin{centertable}{Profile directory support for masking/forcing use flags in stable versions only}
+    \label{tab:profile-stablemask}
+    \begin{tabular}{ll}
+      \toprule
+      \multicolumn{1}{c}{\textbf{EAPI}} &
+      \multicolumn{1}{c}{\textbf{Supports masking/forcing use flags in stable versions?}} \\
+      \midrule
+      0, 1, 2, 3, 4     & No  \\
+      5, 6              & Yes \\
+      \bottomrule
     \end{tabular}
 \end{centertable}