[UP-3717] Updates based on code review comments.  Remove move "magic" values from the code.