Simplified a couple of inline callbacks.