Only perform checks when appropriate; add zeroing out.