Fixes #1. Also removes some clutter.