Mark - Remove some stray sysout.
Mark - Inline.
Mark - More explicit handling of unexpected events.