Address #92

/cc @mikesherov 
Why is this line needed? You're saying this is only for non-declarations?