Small code cleanups.

Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>