Cleaned up some code where local variables were getting created un necessarily
Order.previousOrder is mapped incorrectly - TRUNK-4368