Refactoring resolves #3.