cleanup/simplification of beam resolution logic
almost completely fancy now.