The latter are more explicit and easier to understand at the call site. Also removed the redundant crash checks via the log files.