Inline some variables. Simplify domestic animal check. Remove trailing whitespace. This was SVN commit r18317.