Revert "cosmetic 'en-passant'...."

This reverts commit d4810a814c7c7f3db2df15b62367bd1edc7040f6.

Change-Id: Ia062e070c7d7dac5cc4388d1c8e812fb97851d52
Check for recursive maps

Change-Id: I50227c41c5b4c5c410939ddfa078b996b5804965
Check entity and type name syntax

(For types, only checks their syntax, but not whether they semantically fit in a
certain situation, e.g., "boolean" cannot be used as a base interface.)

Change-Id: I12f617e74ca13ce2afcec8f611bfdb4912c62960