simplify inlining annotation

the scala part is optional as the content of the scala package is
imported by default
some tests added