Reviewed-by: dfuchs
Replaces wildcard usage by loopback, when possible, adds intermittent keyword and a comment, when not. Reviewed-by: chegar
Reviewed-by: darcy, ihse