Actually remove the now-redundant armor flag check in z-ordering.