Simplify extends logic.
Merge pull request #158 from Yelp/simplify_extends_logic

Simplify extends logic.