Move around some lemmas; better names