Removing Staves: More return values.

- RemoveStaves now returns the start and end points of staves in the
X-axis (respectively, after the image).
- Some fixes and renaming.