micro optimization
fix #437: Variable resolution: shadowing
api cleanup