bootstrap: cleanup/simplify syntax