WIP Complete vote logic

Explicit non-nil checks are usually redundant.