Cleaned up mapper_container() expect code.