Reviewed-by: mcimadamore
Rewrite most-specific logic to conform to JLS 8 15.12.2.5 Reviewed-by: vromero