[arch-dev-public] [PATCH 2/3] Use endswith rather than arbitrary array lengths