This is probably trumped by @e0d's branch to skim cruft and move things around. woot.