Simplified things a bit (#1387)