Cleanup/Refactor.

This update should nuke any possible false stacks against Aqualock for
SpoutPlugin's issues.
Signed-off-by: Chris Sanders <zidane@outlook.com>