Improve the grammar for combined rules.

This is still not done, as it doesn't handle any methods
defined on the combined rule yet.