Reworked some APIs for extracting watermarks

Made the extraction of watermarks much more friendly. Removed extra
constructors, or hid them from public view. Updated unit tests to match
new API. Emptied out the Demo project's code, unit tests have taken
over.