OSDN Git Service

Simplify some APIs I was cleaning up while fixing -Wpessimizing-move warning