Minor cleanups

Not a big fan of static import check_error. :(