Replace custom AST traversal by call to forms lib