[MERGE][Trivialish] a number of -Devil checks

[Aaron Bentley]

Aaron Bentley has voted approve.
Status is now: Approved
Comment:
If this goes on much longer, I think DRY demands making an evil_mutter. 
Even if there are a few cases where you want to avoid it, it seems 
useful in the general case.

For details, see: 
http://bundlebuggy.aaronbentley.com/request/%3C1187905105.17572.269.camel%40localhost.localdomain%3E