Fix wider-than-necessary visibility

Bug: 63742
Change-Id: Ifb999d20b9330180c11ff0100cef29d61e5a9071
Allow inline conditionals.

They can be abused, but they aren't always

Bug: 63742
Change-Id: I221a9b3d149cc7401e02bce9b93597eae935639e