Reverted specialization because it caused problems.
Disabled the return and structural checkers.