Small code refractoring.
Added support for y_inline.