Beginning/end character movement bug fixed

...but the fix feels very hacked together. Will continue to think of a
better way to do this tomorrow.