revise custom checks

Ignore-this: 876908c98083f261233f7ffedafafe4f

darcs-hash:20130128074611-312f9-671d52b5f84b2bad65abbb7c3852c7f579b1311f