Eliminate the last hard reference to '16'