Clean up primitive rule a bit.