remove dict comprehensions
add n.includes; import on demand