Restore constantize behavior and use short conditional