case changes related to marvin styling changes

Signed-off-by: Prasanna Santhanam <tsp@apache.org>