Tweaking ore-gen rules.

Partial implementation of changes suggested in issue 24.