Buildsystem cleanup
Bind to inline statements within line