Fix subtyping for enum types with constraints.

Summary: Move the code that handles that case to the end, so we can take
advantage of the other cases that handle the peeling off of Toption,
etc.

Reviewed By: @elgenie

Differential Revision: D1596826