Simplify some code.

Signed-off-by: crynobone <crynobone@gmail.com>
Update deps.

Signed-off-by: crynobone <crynobone@gmail.com>