Sigh. Added more cases for this being used as a variable. Added test for it.