Replaced some implicit rules with explicit tests and patterns.
Better than having make search through every possible implicit rule.