Changed to concat style fixups.