Simplifying error logging, fixing armoring args