For readability, maybe we should more explicitly return nil when minimal_mode is on?