Some more refactoring. Preserved tags through pointer indirection."