May as well roll this into the original list definition.