Removed Step.NO_OBJECT as the problem is solved can be solved by flatMap. This also simplified MapStep -- speed wise. Fixed #347.